Auto merge of #1996 - aturon:cargo-features, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 22 Sep 2015 23:23:09 +0000 (23:23 +0000)
committerbors <bors@rust-lang.org>
Tue, 22 Sep 2015 23:23:09 +0000 (23:23 +0000)
commita7b2c92ccaa8d3bee2943fdc7976840402fb64ae
treed91a22899d688dad1d7e248e730d4c244516cf24
parent0edb544770083760594173e87a612266dc3006bf
parentd7c17d6ee44ca67eac7d604926cbea58f43cbe04
Auto merge of #1996 - aturon:cargo-features, r=alexcrichton

When I was looking for this in the docs, it was a bit confusingly buried.

r? @alexcrichton